Cleaned code...