Style improvements.
Minor changes.