Changed some code to make it more readable
Merge pull request #234 from thethomaseffect/master

Changed some loc to make them more readable