Remove unnecessary lines
Refactor