Refactor; remove excess variable