Re-organize some strings