more code style fixes
more code style fixes
Merge pull request #14 from montaggroup/more_cleanups

More cleanups