Renamed languages to locales in code. Also ran automatic clean-up.
Minor cleanup