Tidyup, hlint, etc.