Fix: block's language form minor issues
Update: code review