Fix header and formating