Tidy up the configurable things