Replaced some statements by a table comprehension