In Progress

Clean factor