Cleaned up more programming style problems as well as string translation.
More code cleanup.