[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.
Could I stick my nose in and suggest that while you are here, any more specific subclass than Exception would be nice?