formatting fixes
Merge pull request #587 from dlobo/FormattingFixes

formatting fixes