formatting fixes
more formatting