Small refactors, increase consistency
Merge pull request #2 from Trevoke/master

Small refactors, increase consistency