Fixes for pull request review's issues

Fixes for pull request review's issues and Reformatted Code