refactor callbacks

remove callback variables and rename callback_ parameter to callback