Some very small optimizations
Merge pull request #62 from RyDroid/master

Some very small optimizations