Remove unnecessary variables
Refactor