some refactoring
Merge branch 'feature/REFACTORING-1'