Change title.
Minor refactorings.