Refactoring
Merging