refactor
displayer polished