Cleaned up config loading