spec: refactoring spec file