fixed issues in code review
localization