Cleaning project and code