Cleans up #trigger Method, Updates Spec