added code review fixes