Cleaner version of the project