Formatting changes and comments
Merge pull request #1 from emilywithrow/master

Formatting changes and comments