diff --git a/assets/js/bobatheme.js b/assets/js/bobatheme.js
index af463bd..efb9efe 100644
--- a/assets/js/bobatheme.js
+++ b/assets/js/bobatheme.js
@@ -12,14 +12,19 @@ window.onscroll = function() {
 window.onload = () => {
     document.querySelectorAll(".code-block").forEach(codeBlock => {
         const button = codeBlock.querySelector(".code-header > .code-copy-button");
-        // TODO: maybe get this from HTMLElement.innerText on the actual code block content element
-        // but it's hard to select it; `data-lang` attribute might not always be there (if lang is unset)
-        const rawCode = codeBlock.querySelector("pre.code-raw").innerText;
+
+        // lang will not be unset because we default it to text
+        // clone it so it doesn't change the actual DOM element
+        const codeElem = codeBlock.querySelector("code[data-lang]").cloneNode(true);
+        // bashsession: remove command output lines
+        codeElem.querySelectorAll(".go").forEach(e => e.parentNode.removeChild(e));
+        // bashsession: remove prompt symbol
+        codeElem.querySelectorAll(".gp").forEach(e => e.parentNode.removeChild(e));
+        const rawCode = codeElem.innerText;
 
         const originalCopyText = button.innerHTML;
         button.onclick = event => {
             navigator.clipboard.writeText(rawCode);
-            console.log(rawCode);
             // TODO: maybe we could add a fancier indicator, like a flash or something
             event.target.innerHTML = "Copied!";
             setTimeout(() => {
diff --git a/layouts/_default/_markup/render-codeblock.html b/layouts/_default/_markup/render-codeblock.html
index ea3a58d..ba4e001 100644
--- a/layouts/_default/_markup/render-codeblock.html
+++ b/layouts/_default/_markup/render-codeblock.html
@@ -1,13 +1,15 @@
+{{ $type := "text" }}
+{{ with .Type }}
+    {{ $type = . }}
+{{ end }}
 <div class="code-block">
     <div class="code-header">
-        <span class="code-type">{{ .Type }}</span>
+        <span class="code-type">{{ $type }}</span>
         <a class="code-copy-button">
             {{ i18n "copy_to_clipboard" }}
         </a>
     </div>
-    {{/* a div.highlight is already created by highlight function */}}
-    {{ highlight .Inner .Type }}
 
-    {{/* for copy to clipboard */}}
-    <pre class="code-raw" style="display: none;">{{ .Inner }}</pre>
+    {{/* a div.highlight is already created by highlight function */}}
+    {{ highlight .Inner $type }}
 </div>