Arranged a bit the code...