Address review feedback from andrerod