cleaning up the code...