[Minor] Fix style, formatting and naming in BlockManager etc.

This is a precursor to a bigger change. I wanted to separate out the relatively insignificant changes so the ultimate PR is not inflated.

(Warning: this PR is full of unimportant nitpicks)
Well should this just do nothing if the block is not found (other than return `None`)? I think we handle this correctly downstream from this.