Cleanup the use/outputter a bit