Further cleaned callback logic.