[KFSQA-1006] Changes made based on Kyle's review comment