I agree with this improvement. Another issue with my AUT is that there is no coding standard and about 15 developers doing there own thing and not always providing good object properties to even capture. So, a bigger issue for me for this review.