diff --git a/src/AbstractRepository.php b/src/AbstractRepository.php
index fa97966..7b893e6 100644
--- a/src/AbstractRepository.php
+++ b/src/AbstractRepository.php
@@ -36,31 +36,32 @@ abstract class AbstractRepository implements RepositoryInterface {
 	}
 
 
-	/**
-	 * @param object $object
-	 * @param callable|null $method
-	 * @return array
-	 * @throws RepositoryException
-	 */
+	/** @inheritDoc */
 	public function getProperties(object $object, callable $method = null) : array {
 		try{
 			$class = get_class($object);
 			if(!isset(static::$classes[$class])) static::$classes[$class] = new ReflectionClass($class);
+
 			/** @var ReflectionProperty $property */
 			foreach(static::$classes[$class]->getProperties() as $property){
 				if(!$property->isInitialized($object) || is_array($property->getValue($object))) continue;
+
 				if(static::$classes[$class]->hasMethod('get'.ucfirst($property->getName()))){
 					$fieldValue[$property->getName()] = $object->{'get'.ucfirst($property->getName())}($property->getValue($object));
 				}
 				elseif($property->hasType() && class_exists($property->getType()->getName()) && $property->getValue($object) instanceof ValueObjectInterface){
-					$fieldValue[$property->getName()] = $property->getValue($object)->get();
+					$fieldValue[$property->getName()] = $property->getValue($object)->getValue();
 				}
 				elseif(is_bool($property->getValue($object))){
 					$fieldValue[$property->getName()] = (int) $property->getValue($object);
 				}
-				else $fieldValue[$property->getName()] = $property->getValue($object);
-				$fieldNameSnakeCase = strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()));
-				if(false !== $fieldValue[$property->getName()]) $out[$fieldNameSnakeCase] = $fieldValue[$property->getName()];
+				else {
+					$fieldValue[$property->getName()] = $property->getValue($object);
+				}
+
+				if(false !== $fieldValue[$property->getName()]) {
+					$out[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] = $fieldValue[$property->getName()];
+				}
 			}
 			return (isset($method)) ? array_map($method, $out ?? []) : $out ?? [];
 		}
@@ -82,16 +83,26 @@ abstract class AbstractRepository implements RepositoryInterface {
 		try {
 			foreach($class->getProperties() as $property){
 				if($update && !array_key_exists($property->getName(), $data) && !array_key_exists(strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName())), $data)) continue;
+
 				// data[propertyName] ?? data[property_name] ?? null
 				$value = $data[$property->getName()] ?? $data[strtolower(preg_replace("'([A-Z])'", "_$1", $property->getName()))] ?? null;
+
 				// если есть внутренний метод (приоритетная обработка)
-				if($class->hasMethod('set'.ucfirst($property->getName()))) $object->{'set'.ucfirst($property->getName())}($value);
+				if($class->hasMethod('set'.ucfirst($property->getName()))) {
+					$object->{'set'.ucfirst($property->getName())}($value);
+				}
 				// Если тип свойства класс (valueObject)
-				elseif($property->hasType() && class_exists($property->getType()->getName())) $object->{$property->getName()} = (is_object($value)) ? $value : new ($property->getType()->getName())($value);
+				elseif($property->hasType() && class_exists($property->getType()->getName())) {
+					$object->{$property->getName()} = (is_object($value)) ? $value : new ($property->getType()->getName())($value);
+				}
 				// если значения не пустое
-				elseif(isset($value)) $object->{$property->getName()} = $value;
+				elseif(isset($value)) {
+					$object->{$property->getName()} = $value;
+				}
 				// если значения может быть пустое
-				elseif($property->getType()->allowsNull()) $object->{$property->getName()} = null;
+				elseif($property->getType()->allowsNull()) {
+					$object->{$property->getName()} = null;
+				}
 			}
 			return $object;
 		}
diff --git a/src/Entity/AbstractEntity.php b/src/Entity/AbstractEntity.php
index acb4e86..8ebc1bb 100644
--- a/src/Entity/AbstractEntity.php
+++ b/src/Entity/AbstractEntity.php
@@ -8,7 +8,7 @@ abstract class AbstractEntity implements EntityInterface {
 	 * @return mixed
 	 */
 	public function getId(): mixed {
-		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->get() : $this->id) : null;
+		return (isset($this->id)) ? (($this->id instanceof ValueObjectInterface) ? $this->id->getValue() : $this->id) : null;
 	}
 
 	/**
diff --git a/src/Entity/ValueObjectInterface.php b/src/Entity/ValueObjectInterface.php
index 40256ff..14a3b70 100644
--- a/src/Entity/ValueObjectInterface.php
+++ b/src/Entity/ValueObjectInterface.php
@@ -4,7 +4,7 @@ namespace Rmphp\Storage\Entity;
 
 interface ValueObjectInterface {
 
-	public function get();
+	public function getValue();
 	public function __toString(): string;
 
 }