reverted refactoring
removed comments
Merge branch 'master' of git@github.com:mrgimo/mixtape-core.git