diff --git a/Dockerfile b/Dockerfile
index b8d8092..88eff95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,44 +1,30 @@
 # FROM mcr.microsoft.com/playwright:v1.20.0
+# Partially from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal
 FROM ubuntu:focal
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Playwright
-# ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
 ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD true
 
-# === INSTALL Node.js ===
-# Taken from https://github.com/microsoft/playwright/blob/main/utils/docker/Dockerfile.focal
-RUN apt-get update && \
-    # Install node16
-    apt-get install -y curl wget && \
-    curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
-    apt-get install -y nodejs && \
-    # Feature-parity with node.js base images.
-    apt-get install -y --no-install-recommends git openssh-client && \
-    npm install -g yarn && \
-    # clean apt cache
-    rm -rf /var/lib/apt/lists/* && \
-    # Create the pwuser
-    adduser pwuser
-
-#  === Install the base requirements to run and debug webdriver implementations ===
+#  Install up-to-date node & npm, then deps for virtual screen & noVNC
 RUN apt-get update \
+    && apt-get install -y curl \
+    && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
+    && apt-get install -y nodejs \
     && apt-get install --no-install-recommends --no-install-suggests -y \
-    xvfb \
-    ca-certificates \
-    x11vnc \
-    curl \
-    tini \
-    novnc websockify \
-    dos2unix \
+      xvfb \
+      ca-certificates \
+      x11vnc \
+      tini \
+      novnc websockify \
+      dos2unix \
     && apt-get clean \
     && rm -rf \
-    /tmp/* \
-    /usr/share/doc/* \
-    /var/cache/* \
-    /var/lib/apt/lists/* \
-    /var/tmp/*
+      /tmp/* \
+      /usr/share/doc/* \
+      /var/cache/* \
+      /var/lib/apt/lists/* \
+      /var/tmp/*
 
 RUN ln -s /usr/share/novnc/vnc_auto.html /usr/share/novnc/index.html
 
@@ -54,7 +40,7 @@ RUN npm install \
 COPY . .
 
 # Shell scripts
-# On windows, git might be configured to check out dos/CRLF line endings, so we convert.
+# On windows, git might be configured to check out dos/CRLF line endings, so we convert them for those people in case they want to build the image.
 RUN dos2unix ./docker/*.sh
 RUN mv ./docker/entrypoint.sh /usr/local/bin/entrypoint \
     && chmod +x /usr/local/bin/entrypoint