Minor refactor of merge class
Callback check
General code quality improvements