More code block tweaking