style updates round 2
Merge pull request #1 from utdhackers/master

style updates round 2