Improve code blocks