Cleaned up the Config