Tidy up settings