Addresses some code smells from landscale.io