clean up code...w