Revert "Minor style cleanup for consisitency."

This reverts commit f711dcb07736f5bef48f0ec770aaa7c60a31e125.
Minor style cleanup for consistency (redo).
Merge pull request #7 from Fryguy/cleanup_coding_style

Cleanup coding style