Make code more readable, remove some dead code and have goimports fix the imports
Merge branch 'master' of https://github.com/ttacon/HyperDex

* 'master' of https://github.com/ttacon/HyperDex:
  Make code more readable, remove some dead code and have goimports fix the imports