code refactoring and CPBI on live test