Fixed due to feedback from code review

Fixed due to feedback from code review