Cleaning up node model and deciding on construction pattern