Refactors
Merge