cleanup nits, this. and removing an unused variable