Better code...