#18 refactoring examples by hlint