Code formatting changes
Merge pull request #1 from rpharrison/develop

Code formatting changes