Tidying up how creator/contributor is assigned