Translation: move some strings, cleanup