Removing unused variable. Refactoring one more method