Nicer display, added in average calculation, made it a bit easier to expand on in the future