one big commit with refactoring, rebasing would be impossible
Merge pull request #110 from devopsbox/plenty-refactings-here

one big commit with refactoring, rebasing would be impossible