Clean Up the display code a bit