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

This is a pre-cursor to a bigger change. I wanted to separate out the relatively insignificant changes so the ultimate PR is not inflated.