Improve node commenting