Clean up code.
Merge pull request #6 from hybridgroup/standardize-callback

Clean up code.