Cleanup code, no changes needed for standardize callback.
Merge pull request #3 from hybridgroup/standardize-callback

Cleanup code, no changes needed for standardize callback.