#43 Composes Helper - move method and refactoring