swapped some enumerateWithBlock to fast enumeration