whitespace / style cleanups.