No changes needed for callback, clean up code.
Merge pull request #1 from hybridgroup/standardize-callback

No changes needed for callback, clean up code.