Add some more formatting