optimized some code
misc
Merge branch 'master' of https://github.com/rickparrish/Usurper