Flow improvement: Reorder if statement to extract common patterns and allow collecting

Reduce the number of possible branches. Use collect instead of Vec::new for collecting values faster and with less allocations