more cleaning up the code...