Code review fix: convert list into variables.