Adding suggested modifications.

Adding all the suggested modification and few more.