I actually didn't think I could improve this much. Still probably 3+ minutes of time save possible too :)