Add some refactorings
Merge pull request #2 from ildarsafin/add-some-refactorings

Add some refactorings