Refactoring
merge