got rid of some redundancy