Clean up way node addition

Refactor to method