Changes after 2nd pass of code review