cleanup work (mostly formating)