Removed string constants
Added language strings