Cleanup config loading a little more