txt -> rst. Small refactorings.