Minor refactoring
Merge pull request #2 from rvasilenko/refactoring

Minor refactoring