localisation and code tidy