Spec cleanup