Refactory internal callback variable
Recatoring internal callback variable