tidying up - no behavior change