fixed some redundancy