Just some comments added.
Refactoring and Cleaning up