more formatting fixes
remove debugging code from production version