completed code refactoring based on the 3dr services client lib api update.