Rename ServiceRegistrar, add comments, remove unused use statement