Move callbacks into own class/file