small refactoring after reading betterspec