More final style fixes.
Merge pull request #104 from alexlatchford/style-fixes

More final style fixes.