Address issues raised in code review