Indent and code clean-up.
Interim commit to sync computers (don't use).