ContentBlocks: fix namespaces
I also shortened some very long lines