cleaned up project2