Cleaned up and made the settings more readable