Make the onopen trigger setup cleaner