Tidy up ConfigVars objects and accessing