Reformatted Callouts and associated MQs

Catching up on latest changes.