Cleaned up the settings