Issue #34 Addressed review comments