Information in config, Code Cleanup