Specification refactioring.