refactoring before new specs