Minor header cleanup