#157: small refactoring, updated specs