Refactor project validator