REFACTOR entiteis
REFACTOR