Stylistic refactor - no substantive changes