Better use of headers
Minor changes