Start refactoring for GiledRose kata