Remove unnecessary variable, introduce a necessary one.