No changes needed for callback, cleanup code a bit.
Merge pull request #5 from hybridgroup/standardize-callback

No changes needed for callback, cleanup code a bit.