Changed some more formatting