Added suggested changes by the author

Implemented all the suggestions discussed.