clarify some variable naming
refactor Routing.provides, some cleanup