Long line/whitespace cleanups