Adding some more formatting