Fix refactoring
Merge branch 'fix/refactoring'