diff --git a/lib/src/widgets/item_builder/item_builder.dart b/lib/src/widgets/item_builder/item_builder.dart
index fa79807..5a1e9fc 100644
--- a/lib/src/widgets/item_builder/item_builder.dart
+++ b/lib/src/widgets/item_builder/item_builder.dart
@@ -19,12 +19,9 @@ class ItemBuilder {
       );
 
       late InputDecoration inputDecoration;
-      if (options.inputDecorationField != null &&
-          options.inputDecorationField![key] != null) {
-        inputDecoration = options.inputDecorationField![key]!;
-      } else {
-        inputDecoration = options.inputDecoration;
-      }
+
+      inputDecoration =
+          options.inputDecorationField?[key] ?? options.inputDecoration;
 
       return Form(
         key: formKey,
@@ -39,11 +36,7 @@ class ItemBuilder {
             }
           },
           validator: (value) {
-            if (options.validators != null &&
-                options.validators![key] != null) {
-              return options.validators![key]!(value);
-            }
-            return null;
+            return options.validators?[key]?.call(value);
           },
         ),
       );
diff --git a/lib/src/widgets/item_builder/item_builder_options.dart b/lib/src/widgets/item_builder/item_builder_options.dart
index b6d60a3..a0600f7 100644
--- a/lib/src/widgets/item_builder/item_builder_options.dart
+++ b/lib/src/widgets/item_builder/item_builder_options.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 
 /// ItemBuilderOptions is a class to store all settings for a field in the profile page.
-/// 
+///
 /// InputDecoration sets the decoration for all standard textfields. This is overridden if a field specific decoration is set by inputDecorationField.
-/// 
+///
 /// inputDecorationField sets the inputdecoration by key of the user data field. So a field can have its own specific decoration.
-/// 
+///
 /// Validator can be used to set a validator for the standard textfield.
 class ItemBuilderOptions {
   ItemBuilderOptions({