Small hotfix for event trigger. And gave all variables nice names