Refactor: Improve variable names by avoiding generic 'data' variable name.

See commit message for details.