Code clean-up
Multilanguage labels added