Code cleanup - 4 (Specially language strings updated)