Cleaned up Project 1