Improved formatting to make it a little easier to parse through quickly