formatting and cleanup
Merge pull request #347 from dlobo/FormattingFixes

formatting and cleanup