cleaned up suggestions from hlint