Reformat new code and fix header injection hole