* Code Cleanup
* Localization Support