Cleaned up config loading a bit