Tidying up aliases/index