Spec cleanup

Spec cleanup