Some refactoring
Another part of refactoring.
Merge pull request #67 from tomislater/refactoring

Some refactoring & linting