updates for code review comments - Issue #7