Refactor project, review commands