some more source getting formatted
Merge pull request #1308 from sbt/wip/moreformatting

some more source getting formatted