Simplified things a bit
Merge branch 'master' of https://github.com/crista/exercises-in-programming-style