more specs and small refactor