consistent variable naming
unset callback fixed