Refactor team project