infrastructure for text is put in place, code cleaning