Refactoring
Merge branch 'refactoring'