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.
I think I read the change wrong, the change is the dropping of "_", I thought the indentation was being shifted