CA-127510: Refactoring as per code review.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>