Cleanup code for project 1