Refactor.
Merge pull request #2 from martin-helmich/feature-refactoring

Do some refactorings