Refactoring: change nodes.pp locality