CS fix: Removed extra whitespace. Implemented service-locator backed routine manager.