some refactoring
Merge pull request #1 from zygmuntz/master

some refactoring