Refactoring towards #27