diff --git a/database/factories/Account.php b/database/factories/Account.php
index 3f2547acb..82247a3d8 100644
--- a/database/factories/Account.php
+++ b/database/factories/Account.php
@@ -23,20 +23,8 @@ $factory->define(Account::class, function (Faker $faker) use ($company) {
     ];
 });
 
-$factory->state(Account::class, 'enabled', function (Faker $faker) {
-    return [
-        'enabled' => 1,
-    ];
-});
+$factory->state(Account::class, 'enabled', ['enabled' => 1]);
 
-$factory->state(Account::class, 'disabled', function (Faker $faker) {
-    return [
-        'enabled' => 0,
-    ];
-});
+$factory->state(Account::class, 'disabled', ['enabled' => 0]);
 
-$factory->state(Account::class, 'default_currency', function (Faker $faker) {
-    return [
-        'currency_code' => setting('default.currency'),
-    ];
-});
+$factory->state(Account::class, 'default_currency', ['currency_code' => setting('default.currency')]);
diff --git a/database/factories/Contact.php b/database/factories/Contact.php
index 5abd20c22..e6b2ac4f8 100644
--- a/database/factories/Contact.php
+++ b/database/factories/Contact.php
@@ -10,9 +10,11 @@ $company = $user->companies()->first();
 $factory->define(Contact::class, function (Faker $faker) use ($company) {
     setting()->setExtraColumns(['company_id' => $company->id]);
 
+    $types = ['customer', 'vendor'];
+
     return [
         'company_id' => $company->id,
-        'type' => $faker->boolean ? 'customer' : 'vendor',
+        'type' => $faker->randomElement($types),
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
         'user_id' => null,
@@ -26,26 +28,10 @@ $factory->define(Contact::class, function (Faker $faker) use ($company) {
     ];
 });
 
-$factory->state(Contact::class, 'customer', function (Faker $faker) {
-    return [
-        'type' => 'customer',
-    ];
-});
+$factory->state(Contact::class, 'enabled', ['enabled' => 1]);
 
-$factory->state(Contact::class, 'vendor', function (Faker $faker) {
-    return [
-        'type' => 'vendor',
-    ];
-});
+$factory->state(Contact::class, 'disabled', ['enabled' => 0]);
 
-$factory->state(Contact::class, 'enabled', function (Faker $faker) {
-    return [
-        'enabled' => 1,
-    ];
-});
+$factory->state(Contact::class, 'customer', ['type' => 'customer']);
 
-$factory->state(Contact::class, 'disabled', function (Faker $faker) {
-    return [
-        'enabled' => 0,
-    ];
-});
+$factory->state(Contact::class, 'vendor', ['type' => 'vendor']);
diff --git a/database/factories/Item.php b/database/factories/Item.php
index 12e3674d2..d61ccaf77 100644
--- a/database/factories/Item.php
+++ b/database/factories/Item.php
@@ -22,14 +22,6 @@ $factory->define(Item::class, function (Faker $faker) use ($company) {
     ];
 });
 
-$factory->state(Item::class, 'enabled', function (Faker $faker) {
-    return [
-        'enabled' => 1,
-    ];
-});
+$factory->state(Item::class, 'enabled', ['enabled' => 1]);
 
-$factory->state(Item::class, 'disabled', function (Faker $faker) {
-    return [
-        'enabled' => 0,
-    ];
-});
+$factory->state(Item::class, 'disabled', ['enabled' => 0]);
diff --git a/database/factories/Transaction.php b/database/factories/Transaction.php
index ea00d92b8..56509c866 100644
--- a/database/factories/Transaction.php
+++ b/database/factories/Transaction.php
@@ -10,7 +10,8 @@ $company = $user->companies()->first();
 $factory->define(Transaction::class, function (Faker $faker) use ($company) {
 	setting()->setExtraColumns(['company_id' => $company->id]);
 
-	$type = $faker->boolean ? 'income' : 'expense';
+	$types = ['income', 'expense'];
+	$type = $faker->randomElement($types);
 
 	return [
 		'company_id' => $company->id,
diff --git a/database/factories/User.php b/database/factories/User.php
index e84e42687..bca544a95 100644
--- a/database/factories/User.php
+++ b/database/factories/User.php
@@ -20,14 +20,6 @@ $factory->define(User::class, function (Faker $faker) {
     ];
 });
 
-$factory->state(User::class, 'enabled', function (Faker $faker) {
-    return [
-        'enabled' => 1,
-    ];
-});
+$factory->state(User::class, 'enabled', ['enabled' => 1]);
 
-$factory->state(User::class, 'disabled', function (Faker $faker) {
-    return [
-        'enabled' => 0,
-    ];
-});
+$factory->state(User::class, 'disabled', ['enabled' => 0]);