cleaning code
Merge branch 'master' of git@github.com:jonaslergell/takemethere.git