Fixed checked-in compile error.
Some code stylistic updates.
Couple of little code clean-ups.