code quality improvment