Name refactoring, remove unused var