KFSQA-643 code clean up and ready for review.