Refactor IText