Cleanup code a bit, no changes for standardize callback needed.
Merge pull request #11 from hybridgroup/standardize-callback

Cleanup code a bit, no changes for standardize callback needed.