Fix quoting of arguments in event handler script
Minor code clean up