refactor after finish project