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