Cleanup! TagEditor and Window; MainController