Add quotes around object attributes that are also keywords to some js parsers.
Fix up statement to conform to code style