[Refactor] Initial header cleanup