Small optimalization in the evt function