#16: minor refactoring [skip ci]
#16: minor refactoring [skip ci]