whitespace cleanup, indentation fixes.