refactor callbacks

remove callback variables and rename callback_ to callback