Made other suggested changes