Cleanup code a bit, no changes for standardize callback needed.