KYRA: Slight cleanup.
TONY: Cleanup (don't compare pointer with false).