Code review

Hi Emily.  Let me know when you are free and we can talk through my commits.  Mary