cleanup whitespace
drop unused variable