Cleaned up Cert a bit
more cert tidy