Add convenience func to reverse callbacks and refactor other methods

Add convenience func to reverse callbacks and refactor other methods #15830