Clean up and fix the project in general