Whitespace cleanup, minor changes