diff --git a/crates/aiken-lang/src/format.rs b/crates/aiken-lang/src/format.rs
index b9e4c60e..cb8b32b0 100644
--- a/crates/aiken-lang/src/format.rs
+++ b/crates/aiken-lang/src/format.rs
@@ -9,8 +9,8 @@ use crate::{
         Definition, Function, IfBranch, ModuleConstant, Pattern, RecordConstructor,
         RecordConstructorArg, RecordUpdateSpread, Span, TraceKind, TypeAlias, TypedArg,
         TypedConstant, UnOp, UnqualifiedImport, UntypedArg, UntypedClause, UntypedClauseGuard,
-        UntypedDefinition, UntypedModule, UntypedPattern, UntypedRecordUpdateArg, Use, Validator,
-        CAPTURE_VARIABLE,
+        UntypedDefinition, UntypedFunction, UntypedModule, UntypedPattern, UntypedRecordUpdateArg,
+        Use, Validator, CAPTURE_VARIABLE,
     },
     docvec,
     expr::{UntypedExpr, DEFAULT_ERROR_STR, DEFAULT_TODO_STR},
diff --git a/crates/aiken-lang/src/parser.rs b/crates/aiken-lang/src/parser.rs
index d3eea0a3..304e4bbb 100644
--- a/crates/aiken-lang/src/parser.rs
+++ b/crates/aiken-lang/src/parser.rs
@@ -262,11 +262,7 @@ pub fn validator_parser() -> impl Parser<Token, ast::UntypedDefinition, Error =
                 .map_with_span(
                     |(((arguments, args_span), return_annotation), body), span| ast::Function {
                         arguments,
-                        body: body.unwrap_or(expr::UntypedExpr::Todo {
-                            kind: TodoKind::EmptyFunction,
-                            location: span,
-                            label: None,
-                        }),
+                        body: body.unwrap_or_else(|| expr::UntypedExpr::todo(span, None)),
                         doc: None,
                         location: Span {
                             start: span.start,