Remove commented line

Signed-off-by: Ken Barber <ken@bob.sh>
Rename some functions and vars to make the context clear

Signed-off-by: Ken Barber <ken@bob.sh>