fixing code review issues