minor changes

changed some pointer variable names to be more reflective of their
function.  reversed the if and the else in remove_current to reflect
Dave's instruction that the asserts should run first.