Reformating
Refactoring to allow lookups of node identification info