Code Cleanup :construction_worker:

- Code comment issues fixed
- Unused imports variables removed.
Merge pull request #171 from Asitha/code-cleanup

Code Cleanup :construction_worker: