Cleaned up Project 1 code