Yep, sounds like that should be done while refactoring the classes.