Finished refactoring data.