Towards #64: More refactoring