Spec cleanup for consistency