Implemented hlint linting recommendations