eso: simpler return statement as per Derdon's suggestion