More formatting cleanup
Revert "More formatting cleanup"

This reverts commit 940842c74194f78ac940afc0de45dbd5bfd043d9.
Additional code format cleanup
Additional code format cleanup
Merge pull request #18 from jtianen/master

Continue additional code formatting clean-up