cleaning up locale code