HEADERS without padding logic
Handle padding in headers, refactor padding header logic