Misc cleanup; preparing for making translations