Added code review comments, see #1.