* Added code block termination comments
* Refactored code formatting
* Refactored to be more i18n compatible