Code review

Hi Be.  Here are the edits I would make.  Let me know if you want to go over them in more detail.