Formatted code per conventions.
Merge pull request #92 from scottfrederick/format

Formatted code per conventions.