Tidy up of call to evt js