Refactor spec/