Refactoring dummy nodes