Updates to format to fit style guide.
Merge pull request #445 from laurenrother/master

Updates to format to fit style guide.