minor cleanup
more minor cleanup
move metrics out to its own MetricsService
use isFedoraObject/Datastream predicates instead of duplicating logic.
minor cleanup