Refactored everything
Merge pull request #1 from willemt/simplefied

Refactored everything