refactorings
Merge branch 'refactoring'