Minor cleanup for variables reuse and unused imports.