refactoring in line with someutils v0.5