Slight refactoring before starting to read the v4 header