Simplify Callbacks

Looking over the callback order I am thinking it would be nice to simplify things.

The current callback list is as follows