Cleanup config.pp a bit