refs #13: small refactor