little optimizations
v0.1.2