Partially refactor specifications