Try to clean up a bit more formatting