Cleaning up the spec