remove useless line return in debug
add some comments