refactor code as core was growing quite big