Refactoring in lesson 4b
 * More tests passing, only one failing