Light refactoring
Text 6 full