Whitespace and code standard update.  No logic changes