Merge pull request #1 from wtg/rpiStyle

Rpi style
Additional style changes
Style updates