all this isn't needed

Signed-off-by: Tomas Neme <lacrymology@gmail.com>
rename variables

Signed-off-by: Tomas Neme <lacrymology@gmail.com>