Improved code blocks