Tidied up Certificates