Cleanup project
Refactoring