cosmetics: whitespace, prettyprinting, coding style fixes