Implemented some hlint-suggested changes.