Design refactoring, pt. 2