Refactoring
Unused variables