Refactor : use Objects