Separating attribution from code in a clearer fashion.