Clean project, refactoring #1