GUAC-546 Made changes for code review.