Cleaned up the project and comments