Code quality upgrade