begin refactoring
more refactorings
Merge pull request #1 from gexxxter/refactorings

Refactorings