TUI Refactor error cleared