Tidy up default settings