Standardize callback

Mostly cleanup code no changes required for callbacks.