[Refactor] As simple display as possible