Standardize callback

Cleanup code since callback changes were not required.