And some more formatting