minor changes, to make info extraction shorter