Refactoring Node and Network aspects of code