Bit of cleanup

[navidcy]

@jagoosw I admit I didn't run this could you try it out?

mostly I wanted to change the nodes extraction to be called on P instead of the P.grid so that the location is automatically inferred...