Cleaned up the project a little