More refactoring relating to representing text in the frontent