KFSQA-973 corrections made from code review suggestions