Design refactoring, pt. 0