Why match twice? This already performs like a beast. Only perform regex match once
Add realistic branches to step matcher regex