Revert "Finishing output and display"

This reverts commit 5ea5a4f658f821d80f92749aeebdd01836b38b08.