Adds comments as per @aledsage's PR comments