Less whitespace changes.
More less whitespace changes.
Last func converted to conditional.