whitespace cleanup
scripted update of code from master at 38824d8 whitespace cleanup