improve the Code quality