config class update

Updated the config class to keep everything within the class