Revised code-block types