Minor prefactor - no functional changes
Minor prefactor - no functional changes

markstory/lint-review,adrianmoisey/lint-review,zoidbergwill/lint-review,markstory/lint-review,zoidbergwill/lint-review,markstory/lint-review,adrianmoisey/lint-review,zoidbergwill/lint-review