#608 -- address code review comments