remove unneeded variable, name some others