diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
index 2984d8d0f4..d0e74b37ed 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/VorbisUtil.java
@@ -331,7 +331,7 @@ public final class VorbisUtil {
    * @param scratch The bytes of the picture.
    * @return A picture frame from the scratch data.
    */
-  public static PictureFrame buildPictureFrame(ParsableByteArray scratch) {
+  /* package */ static PictureFrame buildPictureFrame(ParsableByteArray scratch) {
     int pictureType = scratch.readInt();
     int mimeTypeLength = scratch.readInt();
     String mimeType = scratch.readString(mimeTypeLength, Charsets.US_ASCII);
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
index 0f87790cb2..51a88fa475 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java
@@ -87,7 +87,6 @@ import org.checkerframework.checker.nullness.qual.EnsuresNonNullIf;
       checkNotNull(setupData.format); // Has been set when the header was read
 
       int startPosition = packet.getPosition();
-
       if (!validateCommentHeaderSignature(packet)) {
         packet.setPosition(startPosition);
         return false;
diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/vorbis/PictureFrame.java b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/vorbis/PictureFrame.java
index 5b656ff50b..fa8349a705 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/vorbis/PictureFrame.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/metadata/vorbis/PictureFrame.java
@@ -24,7 +24,7 @@ import com.google.android.exoplayer2.MediaMetadata;
 import com.google.android.exoplayer2.metadata.Metadata;
 import java.util.Arrays;
 
-/** A picture parsed from a FLAC file. */
+/** A picture parsed from a Vorbis Comment or a FLAC metadata block. */
 public class PictureFrame implements Metadata.Entry {
 
   /** The type of the picture. */