Cleaning up selecting node code