Reacting to code review-2 (#143).