Improve commentary and identifiers