Exercise 1 Added, General Cleanup