Separating the view of the units, clearing folders date and refactoring of code.