Performance/readability changes
Merge branch 'master' of github.com:CodyKelly/Arrows