some small clean-ups, stylings, localization