fixed review remarks