Addresses some code smells from landscale.io
Merge pull request #214 from sudorandom/master

Addresses some code smells from landscale.io