Issue #16 Addressed code review comments