Clean factor

In Progress