Assembly tidying up