refactor + tests
v0.1.15