improve var
improve var
add comments