Tidyup, suggestions from hlint.