fix potential error in the future
remove all instances of var