cleanup some debugging printlns
change tabs to spaces and trim trailing