cleaning code & add localisation