Spec clean up