refactor callbacks

remove callback variables and rename callback_ to callback
Merge pull request #81 from rvagg/refactor-callbacks

refactor callbacks