diff --git a/src/state/CallViewModel.ts b/src/state/CallViewModel.ts
index 84e1592e..a83eb1e8 100644
--- a/src/state/CallViewModel.ts
+++ b/src/state/CallViewModel.ts
@@ -375,16 +375,12 @@ export class CallViewModel extends ViewModel {
       }),
     );
 
-  /**
-   * The raw list of RemoteParticipants as reported by LiveKit
-   */
-  private readonly rawRemoteParticipants: Observable<RemoteParticipant[]> =
-    connectedParticipantsObserver(this.livekitRoom).pipe(this.scope.state());
+  private readonly rawRemoteParticipants = connectedParticipantsObserver(
+    this.livekitRoom,
+  ).pipe(this.scope.state());
 
-  /**
-   * Lists of RemoteParticipants to "hold" on display, even if LiveKit claims that
-   * they've left
-   */
+  // Lists of RemoteParticipants to "hold" on display, even if LiveKit claims that
+  // they've left
   private readonly remoteParticipantHolds: Observable<RemoteParticipant[][]> =
     this.connectionState.pipe(
       withLatestFrom(this.rawRemoteParticipants),
@@ -419,9 +415,6 @@ export class CallViewModel extends ViewModel {
       ),
     );
 
-  /**
-   * The RemoteParticipants including those that are being "held" on the screen
-   */
   private readonly remoteParticipants: Observable<RemoteParticipant[]> =
     combineLatest(
       [this.rawRemoteParticipants, this.remoteParticipantHolds],
@@ -443,9 +436,6 @@ export class CallViewModel extends ViewModel {
       },
     );
 
-  /**
-   * List of MediaItems that we want to display
-   */
   private readonly mediaItems: Observable<MediaItem[]> = combineLatest([
     this.remoteParticipants,
     observeParticipantMedia(this.livekitRoom.localParticipant),
@@ -551,18 +541,12 @@ export class CallViewModel extends ViewModel {
     this.scope.state(),
   );
 
-  /**
-   * List of MediaItems that we want to display, that are of type UserMedia
-   */
   private readonly userMedia: Observable<UserMedia[]> = this.mediaItems.pipe(
     map((mediaItems) =>
       mediaItems.filter((m): m is UserMedia => m instanceof UserMedia),
     ),
   );
 
-  /**
-   * List of MediaItems that we want to display, that are of type ScreenShare
-   */
   private readonly screenShares: Observable<ScreenShare[]> =
     this.mediaItems.pipe(
       map((mediaItems) =>