Refactoring: Remove ServiceLocator and invoke objects directly (tell don't ask)