Improving code...