Implements CodeClimate suggestions
Moar CodeClimate
Merge branch 'master' of https://github.com/spike01/mapp