minor refactoring after PR merge
v0.1.3