OPS-84_Integrate_API16 refactored a few functions and added some code improvements
OPS-84_Integrate_API16 refactored a few functions and added some code improvements

rightscale/right_chimp,rightscale/right_chimp,rightscale/right_chimp