PR #16 code review