smaller headers and remove use of * selector