Cleaning up output management in code and menus.