Cleaned and optimized the project