Project2 Cleaned up