Some more cleanup, extracted string resources