Cleaned up DI in CtrlMain & CtrlUndo