Headers, docs, and reduncancy