Refactoring to migrate methods closer to the data they encapsulate