cleaned up code and satisfied problem 1