Cleaned up the display format