Minor programming style changes.