More refactoring - block body renamed content