Guardify
Spec cleanups