Issue #121 Addressed code review comments