Small re-factoring on TextItem