Cleaned the code...