[Brightbox] Code style clean up

First pass at cleaning up the code to a better, more consistent style.
Merge pull request #2437 from brightbox/style_cleanup

[Brightbox] Code style clean up