Tidy up settings loading