Convert CertSorter creation to dependency injection.
Stylish fixes.