String localisation preparation and other code beautifying