Refactoring on header (errors on text)