Refactoring
Merged