[Kate/David] Refactoring