Cleaned the project a bit