Clean up how we generate Ids