[Brightbox] Code style clean up

First pass at cleaning up the code to a better, more consistent style.