refactored the spec file