cleanup some whitespace / comment formatting