Renamed variable, extracted local variable to field and added test
removed unused method