Iteration 1 of code review for pr #49