Minor improvements according to hlint suggestions