Made Text implementation clearer