fix wrong/unused variable name
wrap long lines