Addressing suggestions per PR #104