+ refactorings
Merge pull request #4 from inexplicable/master

some refactorings