Neglect safe (controller) methods scope, Compositor refactor, tidy up