Cleaned up Configs