Clean up code blocks