Towards #64: Refactoring