Coding Style Improvements and Converted Strings to Translatable Strings