Refactoring
Mainly adding internationalization support.