some refactoring
Merge pull request #43 from mactepblack/refactor

some refactoring