Addressed Gregg's code review feedback.