Cleanup code no changes needed for new callback format.
Merge pull request #15 from hybridgroup/standardize-callback

Cleanup code no changes needed for new callback format.