Refactor : better presentation