minor changes: tidying up