fixed some redundancies