Refactoring NodeLocation