refactoring (see #216 Comment 43)