Cleanup code no callback changes required.
Merge pull request #6 from hybridgroup/standardize-callback

Cleanup code no callback changes required.