Continued refactoring Text