Refactoring. Simple improvements.
Refactoring. Simple improvements.
Add internationalization.