addressing own comments in PR #292