Text fixin', refactorin'