#49 refactoring with hlint