some random style nits

most of these were suggested by intellij but pass a gut check to me; lmk if you there are conventions that we should decide more clearly one way or the other on.
Similarly here - does this contradict anything scalariform or anything we can add there to enforce this?