Refactor
Merge conflict resolved