[CLEANUP] Improve variable names and add @var annotations.