[ToDo]Tweaks
Merge pull request #862 from hitesh96db/todos

[ToDo]Tweaks