Made some of suggested changes.