Tidy up some default settings