Refactor into Message / MessageHeaders classes