Refactor TarHeader a bit