First pass at style fixes

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'makeover'