small refactor to specs