[Develop_1]Some refactor