some cleanup according to hlint results