No changes needed for callback, cleanup code a bit.