Minor improvements on style.
Other style improvements.