remove an unused class
rename a variable for clarity