address Andy's code review