PROJECT Refactor