code changed based on code review requirements