Refactor the specification