Add logic to further clean up output pane