some changes for code quality