simplify extraction logic
0.1.2