Addressing code review feedback from @adamralph