Cosmetic - reformatted. I'm embarking on some refactorings to accomodate a snazzy new demo app and wanted to get indentation cleanup committed in one commit so the later meatier commits won't have whitespace diffs also.