Standardize callback, cleanup code.
Merge pull request #10 from hybridgroup/standardize-callback

Standardize callback, cleanup code.