Made all suggested changes.