Follow code review advice from hlint