Refactoring of Dashtap.

* All occuring 'return' statements now have explicit return values.

* All functions that returned from inside an if statement now use 'else'
  instead.