remove debugging
stylistic changes