diff --git a/packages/schema/src/valibot.ts b/packages/schema/src/valibot.ts
index a2bf138..83a3763 100644
--- a/packages/schema/src/valibot.ts
+++ b/packages/schema/src/valibot.ts
@@ -2,29 +2,33 @@ import { createInsertSchema, createSelectSchema, createUpdateSchema } from "driz
 import { pipe, picklist } from "valibot";
 import { projects, tasks, PROJECT_STATUSES, TASK_STATUSES, PRIORITIES } from "./drizzle/index";
 
+const createProjectStatusSchema = (schema: any) => pipe(schema, picklist([...PROJECT_STATUSES])) as any;
+const createTaskStatusSchema = (schema: any) => pipe(schema, picklist([...TASK_STATUSES])) as any;
+const createPrioritySchema = (schema: any) => pipe(schema, picklist([...PRIORITIES])) as any;
+
 export const projectSelect = createSelectSchema(projects, {
-  status: (schema: any) => pipe(schema, picklist([...PROJECT_STATUSES])) as any,
+  status: createProjectStatusSchema,
 });
 
 export const taskSelect = createSelectSchema(tasks, {
-  status: (schema: any) => pipe(schema, picklist([...TASK_STATUSES])) as any,
-  priority: (schema: any) => pipe(schema, picklist([...PRIORITIES])) as any,
+  status: createTaskStatusSchema,
+  priority: createPrioritySchema,
 });
 
 export const projectInsert = createInsertSchema(projects, {
-  status: (schema: any) => pipe(schema, picklist([...PROJECT_STATUSES])) as any,
+  status: createProjectStatusSchema,
 });
 
 export const projectUpdate = createUpdateSchema(projects, {
-  status: (schema: any) => pipe(schema, picklist([...PROJECT_STATUSES])) as any,
+  status: createProjectStatusSchema,
 });
 
 export const taskInsert = createInsertSchema(tasks, {
-  status: (schema: any) => pipe(schema, picklist([...TASK_STATUSES])) as any,
-  priority: (schema: any) => pipe(schema, picklist([...PRIORITIES])) as any,
+  status: createTaskStatusSchema,
+  priority: createPrioritySchema,
 });
 
 export const taskUpdate = createUpdateSchema(tasks, {
-  status: (schema: any) => pipe(schema, picklist([...TASK_STATUSES])) as any,
-  priority: (schema: any) => pipe(schema, picklist([...PRIORITIES])) as any,
+  status: createTaskStatusSchema,
+  priority: createPrioritySchema,
 });