KFSCNTRB-1459 Add changes suggested during code review