Style cleanup, tabs and whitespace

Removed all line ending whitespace.

Changed tabs to spaces and reindented to match in-house style.