Fixing some minor style bugs
Merge pull request #1 from connorshea/master

Fixing some minor style bugs