Make headers better