Small Code Smell Fixes
Merge pull request #216 from sudorandom/master

Small Code Smell Fixes