code clean up: unused variables
code clean up: tiny optimization