start work in refactoring branch
simple refactoring is done