Tidy up settings formatting