Added extra localisation per request
+ Some cleanup