Cleanup code since callback changes were not required.
Merge pull request #18 from hybridgroup/standardize-callback

Cleanup code since callback changes were not required.