Improve callbackList code