Fix mang-3087; code clean up for code block node
minor cleanup
Merge pull request #1448 from ke-yu/fix_magn3087

Fix magn3087