Refactor project variables