Refactor contribution spec messages