Improvements from code review at PR-134