:lipstick: cleaning up header