Text- chapter review ´+ refactoring