Addressing feedback from PR #151