Cleanup to pass style checks
Merge pull request #7 from RoboticCheese/jdh-assorted-updates

Cleanup to pass style checks