Cleanup! FileFormatter and Window; MainController