address issues from code review (issue #25)