Cleanup of display code, preparing for the astyle.