-- More adjustments to style.

Signed off by: Mark Farrell<markfarr2011@gmail.com>