[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)
Minor - but I think it's a bit nicer to assign expressions like this to a variable rather than having function calls interpolated in strings.