Issue #61 Addressed code review comments