Standardize callback

Clean up code