My suggestions

Here are some suggestions. I've also put inline comments.