Restructure to make printing data more readable.