Issue #340 - Minor cleanup before PR review