simplify
cleaned up
Exercise 1.7