Cleanup code standardize callbacks.
Merge pull request #24 from hybridgroup/standardize-callback

Cleanup code standardize callbacks.