Simplify logic
soontm: better style for CertFP options