More localization

Also formatting files