follow header conventions more closely