Exercise 1.43 not working
easier maintenance
clean-up