Refactoring
Merge commit