refactoring continues
refactoring
Merge pull request #232 from jcadek/master

Refactor