Address Jim's code review feedback