Cleaned the project, small refactoring