Remove unused imports and clarify variable names