Improve a header template and deleting comments in the other files