tidying up code...