some code styling cleanups
Merge pull request #344 from eddiemonge/styling

some code styling cleanups