Formatting
Refactoring
Refs #1086 - improve hhvm compatibility when linting