diff --git a/app/api/getActive/route.ts b/app/api/getActive/route.ts
index a54b4b4..a47825b 100644
--- a/app/api/getActive/route.ts
+++ b/app/api/getActive/route.ts
@@ -1,7 +1,7 @@
 import { NextResponse } from 'next/server';
 import fs from 'fs';
 import path from 'path';
-// import config from '../../../config';
+import { createSuccessResponse, createErrorResponse, withErrorHandling } from '../../../lib/apiHelpers';
 
 const FILE_DIRECTORY = path.resolve(process.env.FILE_DIRECTORY || './files')
 // Ensure directory exists
@@ -10,7 +10,7 @@ if (!fs.existsSync(FILE_DIRECTORY)) {
 }
 console.log('using',  FILE_DIRECTORY)
 
-export async function GET() {
+async function getActiveHandler() {
     try {
         const largePath = path.join(FILE_DIRECTORY, 'large.txt');
         const leftPath = path.join(FILE_DIRECTORY, 'left.txt');
@@ -20,38 +20,27 @@ export async function GET() {
         const bottomLeftPath = path.join(FILE_DIRECTORY, 'bottomLeft.txt');
         const bottomRightPath = path.join(FILE_DIRECTORY, 'bottomRight.txt');
 
-        const tankPath = path.join(FILE_DIRECTORY, 'tank.txt');
-        const treePath = path.join(FILE_DIRECTORY, 'tree.txt');
-        const kittyPath = path.join(FILE_DIRECTORY, 'kitty.txt');
-        const chickenPath = path.join(FILE_DIRECTORY, 'chicken.txt');
+        const large = fs.existsSync(largePath) ? fs.readFileSync(largePath, 'utf-8').trim() : null;
+        const left = fs.existsSync(leftPath) ? fs.readFileSync(leftPath, 'utf-8').trim() : null;
+        const right = fs.existsSync(rightPath) ? fs.readFileSync(rightPath, 'utf-8').trim() : null;
+        const topLeft = fs.existsSync(topLeftPath) ? fs.readFileSync(topLeftPath, 'utf-8').trim() : null;
+        const topRight = fs.existsSync(topRightPath) ? fs.readFileSync(topRightPath, 'utf-8').trim() : null;
+        const bottomLeft = fs.existsSync(bottomLeftPath) ? fs.readFileSync(bottomLeftPath, 'utf-8').trim() : null;
+        const bottomRight = fs.existsSync(bottomRightPath) ? fs.readFileSync(bottomRightPath, 'utf-8').trim() : null;
 
-    
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const large = fs.existsSync(largePath) ? fs.readFileSync(largePath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const left = fs.existsSync(leftPath) ? fs.readFileSync(leftPath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const right = fs.existsSync(rightPath) ? fs.readFileSync(rightPath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const topLeft = fs.existsSync(topLeftPath) ? fs.readFileSync(topLeftPath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const topRight = fs.existsSync(topRightPath) ? fs.readFileSync(topRightPath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const bottomLeft = fs.existsSync(bottomLeftPath) ? fs.readFileSync(bottomLeftPath, 'utf-8') : null;
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const bottomRight = fs.existsSync(bottomRightPath) ? fs.readFileSync(bottomRightPath, 'utf-8') : null;
-
-        const tank = fs.existsSync(tankPath) ? fs.readFileSync(tankPath, 'utf-8') : null;
-        const tree = fs.existsSync(treePath) ?  fs.readFileSync(treePath, 'utf-8') : null;
-        const kitty = fs.existsSync(kittyPath) ? fs.readFileSync(kittyPath, 'utf-8') : null;
-        const chicken = fs.existsSync(chickenPath) ? fs.readFileSync(chickenPath, 'utf-8') : null;
-
-        // For SaT
-        return NextResponse.json({ large, left, right, topLeft, topRight, bottomLeft, bottomRight }, {status: 201})
-        // return NextResponse.json({ tank, tree, kitty, chicken }, {status: 201})
-      } catch (error) {
+        return createSuccessResponse({
+            large,
+            left,
+            right,
+            topLeft,
+            topRight,
+            bottomLeft,
+            bottomRight
+        });
+    } catch (error) {
         console.error('Error reading active sources:', error);
-        return NextResponse.json({ error: 'Failed to read active sources' }, {status: 500});
-      }
+        return createErrorResponse('Failed to read active sources', 500, 'Could not read source files', error);
+    }
+}
 
-}
\ No newline at end of file
+export const GET = withErrorHandling(getActiveHandler);
\ No newline at end of file
diff --git a/app/page.tsx b/app/page.tsx
index b99c179..d8d9eae 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -81,7 +81,7 @@ export default function Home() {
       ]);
       
       setStreams(streamsData.data);
-      setActiveSources(activeData);
+      setActiveSources(activeData.data);
     } catch (error) {
       console.error('Error fetching data:', error);
       showError('Failed to Load Data', 'Could not fetch streams. Please refresh the page.');