Refactor
Fix merge