Code Cleanup :construction_worker:

- code comment issues fixed
- unused imports variables removed.