Some node line refactoring