Adding some more formatting for the output