diff --git a/Controller/ApiAddressAttributeController.php b/Controller/ApiAddressAttributeController.php
index b148570..2303f54 100644
--- a/Controller/ApiAddressAttributeController.php
+++ b/Controller/ApiAddressAttributeController.php
@@ -447,7 +447,6 @@ final class ApiAddressAttributeController extends Controller
      */
     public function apiAddressAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        return;
         // @todo: I don't think values can be deleted? Only Attributes
         // However, It should be possible to remove UNUSED default values
         // either here or other function?
diff --git a/Controller/ApiAttributeController.php b/Controller/ApiAttributeController.php
index 77b4343..4ea750f 100644
--- a/Controller/ApiAttributeController.php
+++ b/Controller/ApiAttributeController.php
@@ -447,7 +447,6 @@ final class ApiAttributeController extends Controller
      */
     public function apiUnitAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
     {
-        return;
         // @todo: I don't think values can be deleted? Only Attributes
         // However, It should be possible to remove UNUSED default values
         // either here or other function?
diff --git a/Models/Attribute/AddressAttributeMapper.php b/Models/Attribute/AddressAttributeMapper.php
index 33f3707..77694cf 100644
--- a/Models/Attribute/AddressAttributeMapper.php
+++ b/Models/Attribute/AddressAttributeMapper.php
@@ -37,10 +37,10 @@ final class AddressAttributeMapper extends DataMapperFactory
      * @since 1.0.0
      */
     public const COLUMNS = [
-        'address_attr_id'    => ['name' => 'address_attr_id',    'type' => 'int', 'internal' => 'id'],
+        'address_attr_id'       => ['name' => 'address_attr_id',    'type' => 'int', 'internal' => 'id'],
         'address_attr_address'  => ['name' => 'address_attr_address',  'type' => 'int', 'internal' => 'ref'],
-        'address_attr_type'  => ['name' => 'address_attr_type',  'type' => 'int', 'internal' => 'type'],
-        'address_attr_value' => ['name' => 'address_attr_value', 'type' => 'int', 'internal' => 'value'],
+        'address_attr_type'     => ['name' => 'address_attr_type',  'type' => 'int', 'internal' => 'type'],
+        'address_attr_value'    => ['name' => 'address_attr_value', 'type' => 'int', 'internal' => 'value'],
     ];
 
     /**
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 727c945..5843b67 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -66,7 +66,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $account = new Account();
         TestUtils::setMember($account, 'id', 1);
 
-        $permission = new AccountPermission();
+        $permission       = new AccountPermission();
         $permission->unit = 1;
         $permission->app  = 2;
         $permission->setPermission(