Cleanup chapter 5
Merge pull request #24 from martme/martin

Cleanup chapter 5