opt: simplify
v0.1.6