Refactored unused variables