Added suggested changes by the author