change header , fix style