Improve nodes exit