diff --git a/src/utils/getImageUrl.ts b/src/utils/getImageUrl.ts
index bc3c9073..e13872cc 100644
--- a/src/utils/getImageUrl.ts
+++ b/src/utils/getImageUrl.ts
@@ -1,31 +1,41 @@
 import { cdnUrl, thumborUrl } from './config'
 
-const getSizeUrlPart = (options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {}) => {
-  const widthString = options.width ? options.width.toString() : ''
-  const heightString = options.height ? options.height.toString() : ''
+const URL_CONFIG = {
+  cdnUrl: cdnUrl,
+  thumborUrl: `${thumborUrl}/unsafe/`,
+  audioSubfolder: 'audio',
+  imageSubfolder: 'image',
+  productionFolder: 'production/',
+}
 
-  if (!(widthString || heightString) || options.noSizeUrlPart) {
-    return ''
-  }
+const AUDIO_EXTENSIONS = new Set(['wav', 'mp3', 'ogg', 'aif', 'flac'])
 
-  return `${widthString}x${heightString}/`
+const isAudioFile = (filename: string): boolean => {
+  const extension = filename.split('.').pop()?.toLowerCase()
+  return AUDIO_EXTENSIONS.has(extension ?? '')
+}
+const getLastSegment = (url: string): string => url.toLowerCase().split('/').pop() || ''
+
+const buildSizePart = (width?: number, height?: number, includeSize = true): string => {
+  if (!includeSize) return ''
+  const widthPart = width ? width.toString() : ''
+  const heightPart = height ? height.toString() : ''
+  return widthPart || heightPart ? `${widthPart}x${heightPart}/` : ''
 }
 
 export const getImageUrl = (
   src: string,
   options: { width?: number; height?: number; noSizeUrlPart?: boolean } = {},
-) => {
+): string => {
   if (!src.includes('discours.io') && src.includes('http')) {
     return src
   }
-  const filename = src.toLowerCase().split('/').pop()
-  const ext = filename.split('.').pop()
-  const isAudio = ext in ['wav', 'mp3', 'ogg', 'aif', 'flac']
-  const base = isAudio ? cdnUrl : `${thumborUrl}/unsafe/`
-  const suffix = isAudio || options.noSizeUrlPart ? '' : getSizeUrlPart(options)
-  const subfolder = isAudio ? 'audio' : 'image'
+  const filename = getLastSegment(src)
+  const base = isAudioFile(filename) ? URL_CONFIG.cdnUrl : URL_CONFIG.thumborUrl
+  const suffix = options.noSizeUrlPart ? '' : buildSizePart(options.width, options.height)
+  const subfolder = isAudioFile(filename) ? URL_CONFIG.audioSubfolder : URL_CONFIG.imageSubfolder
 
-  return `${base}${suffix}production/${subfolder}/${filename}`
+  return `${base}${suffix}${URL_CONFIG.productionFolder}${subfolder}/${filename}`
 }
 
 export const getOpenGraphImageUrl = (
@@ -37,17 +47,16 @@ export const getOpenGraphImageUrl = (
     width?: number
     height?: number
   },
-) => {
-  const sizeUrlPart = getSizeUrlPart(options)
-
+): string => {
+  const sizeUrlPart = buildSizePart(options.width, options.height)
   const filtersPart = `filters:discourstext('${encodeURIComponent(options.topic)}','${encodeURIComponent(
     options.author,
   )}','${encodeURIComponent(options.title)}')/`
 
-  if (src.startsWith(thumborUrl)) {
-    const thumborKey = src.replace(`${thumborUrl}/unsafe`, '')
-    return `${thumborUrl}/unsafe/${sizeUrlPart}${filtersPart}${thumborKey}`
+  if (src.startsWith(URL_CONFIG.thumborUrl)) {
+    const thumborKey = src.replace(URL_CONFIG.thumborUrl, '')
+    return `${URL_CONFIG.thumborUrl}${sizeUrlPart}${filtersPart}${thumborKey}`
   }
 
-  return `${thumborUrl}/unsafe/${sizeUrlPart}${filtersPart}${src}`
+  return `${URL_CONFIG.thumborUrl}${sizeUrlPart}${filtersPart}${src}`
 }