REFACTOR : Organize code ...