Simplify some of the service provider and improve docblock.

Signed-off-by: crynobone <crynobone@gmail.com>