Cleaned up the project a lil