general cleanup + cleaning up Node construction