Small refactor
Solved merge conflicts