Coding Convention Fixes

I hate Bob