Refactoring in the direction of #15