Fixed formatting a bit more