cleaner header logic