Not happy with the way i handled to array callbacks with internal functions