Response to code review by kevinsawicki