Minor programming style changes.
Minor programming style changes.