Formalize byline model
Couple of missed items from last commit