futher minimal refactorings (#24)