header cleanup and rewording