#11 - Refactor MapperMethodGenerator to simplify code