cut some redundancy