Cleaned up the project a bit