refactoring: clean code, change project setting