Remove println and fix up some more whitespace.