address minor issues raised in code review