Slight refactor of specs