In preparation for doing some work on Savan, reformat code to match WS standards (remove tabs etc) and fix some spelling errors.