cleaned code...