Adding more localization
Cleanning code and fixing typo error