Whitespace cleanup and minor indentation corrections.