Improve quality of ControllerLocator and AbstractResourceLocator