got rid of some redundancies