API documentation has been updated (IServiceLocator). Little code clean-up.