New round of texts and refactoring