Tidying up some links