Chapter 16 exercises done.

For some reason I thought it made my code more readable. I now doubt that though ...