Refactoring

User doto instead of let special form.