Fix a typo in comments and remove an unused variable