Add more formatting