Some more style changes
Use nodeId instead of id