(Issue 340) Addressed review feedback