Cleaned up config setup