#223 Implement feedback from @bbatsov