Whitespace and code formatting clean up.