Improve commentary a bit