Clean-up, move text.