header methods cleanup