refactor spec code
Merge branch 'refactoring_spec_code'