Issue #416 Addressed review comments