Removed quotes on some keys for consistency.