* Added more i18n compatibility
* Added code block termination comments
* Move all code into class structure