Better code block

Built on top of the other PR, see that first.