Tidy up
Config as a Singleton object