Some more formatting work.