Eng 3038 post-review refactoring, no functionality change