CLEANUP: name variables in a more consistent way