Project clean and refactoring