code refinement
- removed unused imports and local variables