Refactoring my data management.