Moved OutputHandling's code into Parser