follow header conventions,

where it doesn't conflict with outshine improvements.