Code cleanup and formatting updates
Merge pull request #11 from JoshuaEstes/master

Code cleanup and formatting updates