clean up some white space, get rid of some debugs