Code Cleanup :construction_worker:

- Code comment issues fixed
- Unused imports variables removed.