Minor refactorings

unused variable.