cleaning of code...