Cleaning of the project
refactored - perry
Refactoring