refactor
fix some typo and adding translateType form
some fixes